[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 udc-qpr-dev am: e5ebbd4e am: 375736a1 -s ours

am skip reason: subject contains skip directive

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



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