Merge QQ1A.191205.011 into stage-aosp-master

Bug: 144955631
Change-Id: I57693840d857018db3553ea2b0099c201c9c9128