Android 11.0.0 release 16
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 688895f696 -s ours
am skip reason: subject contains skip directive

Change-Id: I8491dace3ab55ae3e4e90681110f3f61c48605b8