Android Mainline 11.0.0 Release 27 (7248014)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 799d0b5987 -s ours
am skip reason: subject contains skip directive

Change-Id: I368ae94ee716cb6e74f1e41442be9576996affe7