[automerger skipped] DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: f07d371513 am: 4cf7b483f7
am: 3bfa6ab507 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic1133062f47125a8185ce15cbc4ddf92320bc49e