Android 10.0.0 release 21
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 1fcaef125e -s ours
am skip reason: subject contains skip directive

Change-Id: I95926af526de5f11bb1afd3e573f90167b360c79