[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming...

[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a313 am: 4e411189 -s ours am: 2291d2e8 -s ours am: acd1cc3e -s ours am: c6bded50 -s ours am: 78b208ef -s ours am: ea4433d4 -s ours am: 4cec60c7 -s ours am: dc03e213 -s ours am: 94bbb591 -s ours am: 662aa53f -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: I67738e6ea6f34d3995ca3cd8aafcce85efbd1ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>