Merge "Prevent exfiltration of system files via avatar picker. am: 5981e18eb5 am: 9fa90eb683 am: 97b62f44cd am: 23af1786bb am: 5f0164c875 am: c45b0c45be am: e0e711a47a am: 63bba31b92" into tm-d1-dev-plus-aosp