[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
am: 25522ce664
am: 05f50bb0f6
am: 0c60765de0
-s ours am: fdc6f89708
-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: Ic8d337da94e1c1d006c9af12bb7dc6c65705ca96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: