Merge changes from topic "am-4ed6458f15384f4ea438ed36c18a36d9" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0 am: 3c039ca6 -s ours am: 2df32f53 -s ours am: 4e7bbcce -s ours am: c36d4dd6 -s ours am: 26c8ebc0 -s ours am: 036bf7ec -s ours am: 439b26d3 -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b7530 am: c362ee7d -s ours am: a9488a71 -s ours am: ab11731a -s ours am: cd7282da -s ours am: e199ee1b -s ours am: 5d5c3516 -s ours am: 057911c5 -s ours