Merge "[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: c9e23f4554 -s ours am: 2da4117113 am: 7fef781655" into qt-qpr1-dev-plus-aosp