Merge changes from topic "am-93f41d43c5f04f2d8fcb73fe0e564d13" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into tm-dev am: fb7e1bbc -s ours am: cf401fe0 -s ours
  [automerger skipped] [automerged blank] Prevent exfiltration of system files via avatar picker. 2p: 1b48ca6b 2p: fd3945a3 am: 0187e7f5 -s ours am: 524499af -s ours