Android 10.0.0 Release 42 (QD4A.200317.024.A1)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: ccaf5be6a4 -s ours
am: adc80372dd -s ours
am skip reason: subject contains skip directive

Change-Id: I389e15ea9c2f9139c72ac451798126eab430fdfa