[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master am: 127728b560 -s ours am: 48fdfdc0a4
am: 63adc053c1

Change-Id: I10a5b6fd4b3646a6e01ddcc7c218fc11a8d2a6dd