[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: c823f0aa45
am: ec895b0869
am: 9799773023
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057 Change-Id: I95a1b4d979185a68d2fbc018841ecc4ac01eda16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: