[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: 4ad9d18d -s ours am: f836f550 -s ours am: 8b0139ce -s ours am: 4c01570b -s ours am: 2e7ea414 -s ours am: f83b031f -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: I6262b4705c703a8ce8cc0dba6b55c8ac49406512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>