Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into...

Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1e

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



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