[automerger skipped] DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: 5c4d37fc17 am: e83c435a49
am: 76d596dc62 -s ours
am skip reason: subject contains skip directive

Change-Id: I9c4e4f0cc506d8cb6ff1112513cffccb8e2de0bb