[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-dev am: 9fa4b1e0 am: 3c039ca6 -s ours am: 2df32f53 -s ours am: 4e7bbcce -s ours am: c36d4dd6 -s ours am: 26c8ebc0 -s ours

am skip reason: subject contains skip directive

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



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