[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master am: 491baf7ea4 -s ours am: e70787696b
am: a2c4d90bd5

Change-Id: I45391a3ef5c4c888f334968230954247e812c787