[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 am: 04fa083f5a
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250 Change-Id: Ib501b2baf5b6d394491883e5fc8a09841a2f4d5e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: