[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767
-s ours am: 30ea3d3cec
-s ours am: 9966aaad9e
-s ours am: 2ba102d1cb
-s ours am: b14b767d47
-s ours am: 90c8ce053e
-s ours am: d1b6f8bd76
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760 Change-Id: Ia3218b1640bea3f66785487148bedaa48acf20a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: