Merge changes from topic "am-fb792f4eebbf4516b8fc10e703130a06" into main
* changes: [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am:9fa4b1e0a6
am:3c039ca648
-s ours am:2df32f537f
-s ours am:4e7bbcce82
-s ours am:4ad9d18da2
-s ours am:f836f55043
-s ours am:8b0139ce9d
-s ours am:0254172bb4
-s ours [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am:cb2b753094
am:c362ee7dc2
-s ours am:a9488a71bc
-s ours am:ab11731a5b
-s ours am:18510c531b
-s ours am:2ebd6e63e8
-s ours am:add1702ed9
-s ours am:c39ebdf4ba
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
9baff77fed