[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: 49c8be7ca6 -s ours
am: bc268f77fd

Change-Id: I24cf1f6eb51f0117141efb63db2cdc2fdd223316