[automerger skipped] Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" am: 4806cccece -s ours

am skip reason: Change-Id I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b with SHA-1 44d1c652ce is in history

Change-Id: I540ac57d339a13f282eeaf40044e39ae1ff705cb