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

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a313 am: 4e411189 -s ours am: 2291d2e8 -s ours am: acd1cc3e -s ours am: c6bded50 -s ours am: 78b208ef -s ours am: 23eb92c4 -s ours am: 06ac9247 -s ours am: 773ffcdc -s ours am: 30585305 -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e am: fc05ca8c -s ours am: 5a4bdbb9 -s ours am: 800f77c4 -s ours am: 6f90f9bc -s ours am: cdca52fc -s ours am: fa6de7b2 -s ours am: 3bcf0a8d -s ours am: 64301079 -s ours am: 47cd7ab1 -s ours