Merge QQ1A.191205.011 into stage-aosp-master

Bug: 144955631
Merged-In: I758f777e205c568942abcdda31f2a0cea7cdc08e
Change-Id: Ie5648284e5872b2a1c936a6682bf39ab61486a14