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

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf077 -s ours am: 30ea3d3c -s ours am: 38280de4 -s ours am: 3daa00ee -s ours am: df0234a5 -s ours am: 1a80da1d -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536ab -s ours am: 76f3f2ef -s ours am: e11d0e85 -s ours am: 6c693471 -s ours am: fc49acca -s ours am: 47a3ce17 -s ours