[automerger skipped] DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: fd4749d28e am: 55fa2b769a
am: 06fc3eed12 -s ours
am skip reason: subject contains skip directive

Change-Id: I35b5bc23ccbac7006c208c61d7832cc998d0e393