Merge QQ1A.191205.011 into stage-aosp-master

Bug: 144955631
Merged-In: I482ace6717063630d3c5018c471601cfd21a2f19
Change-Id: I4e52c840563ce3fc739adadf8f9eeb3178afffad