DO NOT MERGE -- Skip QQ2A.200305.003 in stage-aosp-master

Bug: 150410372
Change-Id: I563e912e8c39f4e4c1348b1cfcfd8a724bdb95a9