Android Mainline 10.0.0 Release 5 (6004948)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 8994c24f5c -s ours
am skip reason: subject contains skip directive

Change-Id: I539a4e36eb62bdd5634a5df129bb40aac4e57654