DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master

Bug: 144955631
Merged-In: I86c741f7ede242568aab436f673000c9f0da5813
Change-Id: Ia6a3a55023e4e66811c4ef7c6ccd05c5db3e5944