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

Merged-In: I32e9d0ef0eb218f417d694ca9448c7b127fd897e
Change-Id: I44deee9cfe85d8603b7453b23db8c0515b63b7cf