DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master am: dd7e1b8a32

Change-Id: I3fd00e8f380cec93e15b2b90260e0651f9580a1a