[automerger skipped] Merge QQ1A.191205.011 into stage-aosp-master am: 5cc9ace2 -s ours
am: c7d9fcd0 -s ours
am skip reason: change_id I482ace6717063630d3c5018c471601cfd21a2f19 with SHA1 8b406b8d is in history
Change-Id: Ieb7156ac64ea849500184c5bff723ffc321ba84a