[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-v2-dev am: 376bf077 -s ours am: 30ea3d3c -s ours am: 9966aaad -s ours am: 2ba102d1 -s ours am: 02c3eca0 -s ours am: 3d2e0cfb -s ours am: 8479ffbb -s ours am: a6af3ba7 -s ours

am skip reason: subject contains skip directive

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



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