Merge changes from topic "am-b56b85ea3c0d4196a832257fbcf9a961" into udc-dev-plus-aosp
* changes: [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am:e5f9ab14ce
-s ours am:2c62993aca
-s ours am:71bf0d7467
-s ours am:4c0c2f4fe4
-s ours am:2b31fa004f
-s ours am:7e62ba20d7
-s ours [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am:27a97f4583
-s ours am:a8bd8948d1
-s ours am:02ef9c46ec
-s ours am:ebe5235c23
-s ours am:b24681d7d7
-s ours am:02086812ed
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
d6c0b319ba