Merge "[automerger skipped] RESTRICT AUTOMERGE Update Android from 2020c to 2020d [R] am: 658d472c65 am: f890681665 -s ours am: 5d0fc2f045 -s ours" into rvc-qpr-dev-plus-aosp