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

Change-Id: Ia4e83efaa2e60fbc83d03fac30f8735f6f61a912