Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master am: 4ff59c0e4e

Change-Id: I4290084338bf6b86d2117d7417297b26241356f6