[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-dev am: 6976a313 am: 4e411189 -s ours am: 2291d2e8 -s ours am: acd1cc3e -s ours am: c6bded50 -s ours am: 78b208ef -s ours am: 23eb92c4 -s ours am: 06ac9247 -s ours am: 773ffcdc -s ours am: 30585305 -s ours

am skip reason: subject contains skip directive

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



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