Merge "[automerger skipped] RESTRICT AUTOMERGE Update Android from 2020b to 2020c [R] am: 32561dc17a am: 485ff85747 am: e3502838b6 -s ours" into rvc-qpr-dev-plus-aosp