[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5
-s ours am: 78d86e927c
-s ours am: a81ed851af
-s ours am: 34ea30a0d3
-s ours am: aa7349f210
-s ours am: ef431049c9
-s ours am: 6b1a169820
-s ours am: ba718477ea
-s ours am: 5135d8f003
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846 Change-Id: Ic132c7b6ad2b4ec0891b573e3d54dacd082bbcf9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: