Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0

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



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