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

Change-Id: I19193ba05b514064b934b185a9dba33792ce5227