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

Change-Id: I84bb7aba4b254b5b5fd093485796efa816676e2f