[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: a0c080fd28
-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: Ie8b456f578c6ef5e752eb9284ecdec53cdd472f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: