[automerger skipped] DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master am: af619d9525 am: 6c448695bc -s ours
am skip reason: subject contains skip directive

Change-Id: I1a0eb39ca0e1244e4567c374eb7a7b49b7b4e0ea