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

Bug: 155771477
Change-Id: I5954cb6e71e1a34ce523830aad871601e08e2587
Merged-In: I505bc5504e5545348de48118cd56ebcdf3935680