Merge changes from topic "am-b56b85ea3c0d4196a832257fbcf9a961" into udc-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14 -s ours am: 2c62993a -s ours am: 71bf0d74 -s ours am: 4c0c2f4f -s ours am: 2b31fa00 -s ours am: 7e62ba20 -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f45 -s ours am: a8bd8948 -s ours am: 02ef9c46 -s ours am: ebe5235c -s ours am: b24681d7 -s ours am: 02086812 -s ours