[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: 47419e86d1 -s ours am: afde7924f6
am: 7527dffb6a

Change-Id: I417502fe3b2399e878450c530194895d55eae563