Merge QQ1A.191205.011 into stage-aosp-master

Bug: 144955631
Merged-In: Ie6ce8f381affe89137c911b3964412a1c16fdb80
Change-Id: I53cad5f2e532ef4e7745df6e7cd55d17504ba62b