[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: bf9040d4f9 -s ours am: 377c17d1ea am: db21ccd28a
am: 5b74ad6a0f -s ours
am skip reason: subject contains skip directive

Change-Id: Ie46c2fbbeccf7e3bbe0430c6bc09f7286338801c