[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
am: 25522ce664
am: 05f50bb0f6
-s ours am: 70deaf3698
-s ours am: 524de38fd8
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068 Change-Id: I2da4174f3cba2e1bd37909acbd7758426df65fe1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: