[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 rvc-qpr-dev am: 6cf9c58f -s ours am: 78d86e92 -s ours am: a81ed851 -s ours am: 34ea30a0 -s ours am: aa7349f2 -s ours am: ef431049 -s ours am: 6b1a1698 -s ours am: dc7e74e2 -s ours am: 5ef26eb9 -s ours am: 345abf1b -s ours am: 3be314de -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846



Change-Id: I695d7185aab80bfac790d87f206363b948bac8d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>