Android 10.0.0 Release 18 (QQ1B.191205.011)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: d04d7982c4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib848b07a9bdde6c6d6b83f3d2476eb4a3eeaa729