[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
am: a770df1d2e -s ours
am skip reason: subject contains skip directive

Change-Id: Ie40ba1a0a728160be00d17a6dc0449618cb2dffe