[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c
am: 4e41118949
-s ours am: 2291d2e8ea
-s ours am: acd1cc3ebf
-s ours am: c6bded5070
-s ours am: 78b208efc2
-s ours am: ea4433d4a0
-s ours am: 4cec60c74e
-s ours am: 8bb22c308d
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011 Change-Id: I9a472a80e152b63a74dc1a42376992f693a0caa1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: