[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: 47419e86d1 -s ours
am: afde7924f6

Change-Id: I3363c6517a08f2a7ad1a63d4d32236f2fec7cc7b