[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce
-s ours am: 2c62993aca
-s ours am: 71bf0d7467
-s ours am: 4c0c2f4fe4
-s ours am: 2b31fa004f
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250 Change-Id: Id2e5aeaa3b94b0fdf2e70df63c61fcdd49e3bbb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: