Merge changes from topic "am-47dfae7d86de4657834db071d055ab39" into udc-qpr-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: 66539a3c -s ours am: c60277f9 -s ours am: b0442fec -s ours am: 8a662015 -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: 7fa313e0 -s ours am: c2fd42d3 -s ours am: 3a73889f -s ours am: 49a858cc -s ours