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

Bug: 144955631
Merged-In: I242aebe71ffe7d348eca213252f1691fd444703e
Change-Id: I40ae7732b4435dc9aa9a3edb57275505e4112a4c