Merge changes from topic "am-cc328bbc5f954895bff2984bd1c3911b"
* changes: [automerger skipped] Merge "[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users." into udc-dev am:cd0176ba92
am:97f0292aa4
-s ours [automerger skipped] [RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users. am:a1b7888c30
am:b7a36ed2ff
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
ba50745e91