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

Change-Id: I1b2ad304bf5cdc334c09769cba9dbaa40e0a6ffb