[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
am: 000cdf1b5d
-s ours am: 1dafc2d68b
-s ours am: 7a8357ca00
-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: Ibc9c3f0cb2d50d4470b34f8606730fe7d68f7dff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: