Merge changes from topic "am-47dfae7d86de4657834db071d055ab39" into udc-qpr-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:66539a3cda
-s ours am:c60277f91e
-s ours am:b0442fec71
-s ours am:8a6620158f
-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:7fa313e00e
-s ours am:c2fd42d3ec
-s ours am:3a73889f73
-s ours am:49a858cc5c
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
7cf67e1888