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

Change-Id: Ib32c852dd24c1f67006e6fe7069a10cf1a53b2ed