[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming...

[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14 -s ours am: 2c62993a -s ours am: 71bf0d74 -s ours am: 4c0c2f4f -s ours am: 2b31fa00 -s ours am: 7e62ba20 -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: Ieb1eb4006babc2bc064f58ab17e6511b442907d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>