[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 skip reason: subject contains skip directive

Change-Id: I15dc433dde60af16dbde2c58f434f038ef4b62b6