Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc4288

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



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