Merge QQ1A.191205.011 into stage-aosp-master

Bug: 144955631
Merged-In: I633619458f6550422a934c5c449fb33b5ea3f061
Change-Id: Ia3749ad68f8f81b0b27d5b46fb81c68a473f7e20