Merge QQ1A.191205.011 into stage-aosp-master

Bug: 144955631
Merged-In: Ia6e3b17c3226f2e9bd6ce91110f8cf4d0677c25f
Change-Id: I17b27f5c034be67dc1b2f8b5b56c494c2ba7d1e3