DO NOT MERGE - Merge QQ3A.200605.002 into stage-aosp-master

Bug: 155771477
Change-Id: I05d52262ef02cfe3146cbf685acc1fe448676204
Merged-In: Ic22e37120ee4e9e0187d435831ad9864804c7358