Merge changes from topic "am-b90859b388c34c15b480cf2da68ac051" into udc-dev-plus-aosp
* changes: [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am:6cf9c58fa5
-s ours am:78d86e927c
-s ours am:a81ed851af
-s ours am:34ea30a0d3
-s ours am:aa7349f210
-s ours am:ef431049c9
-s ours am:6b1a169820
-s ours am:ba718477ea
-s ours [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am:0564ec25bb
-s ours am:c07555d438
-s ours am:56c4d2a5a5
-s ours am:045a9bfd32
-s ours am:417c199efa
-s ours am:0d0954c8bc
-s ours am:4c6c18ae10
-s ours am:517e6edc93
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
16cdedd165