[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: 49c8be7ca6 -s ours am: bc268f77fd
am: 6b4db01c1e

Change-Id: I6ee91b80c080c225e39bb395b09e557b96a8cfe1