[automerger skipped] DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master am: 4f3ac4d055 -s ours
am: df879474cd -s ours
am skip reason: subject contains skip directive

Change-Id: I575ecdc72f87fc51aa199a57f136577cbef0e466