[automerger skipped] Merge "Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master
am: 402f6955 -s ours
am skip reason: change_id I62defbbaaf494525c38d7c262c0cd74d3eeb43e2 with SHA1 95e10d99 is in history
Change-Id: I1a204b619d325b85aaeed5c9379b3324d0f6ae87