[automerger skipped] DO NOT MERGE - Merge QQ2A.200405.005 into merge am: 863acd395b -s ours

am skip reason: Change-Id Ie72b0e772eb11d8c5990c1c83987cb5a659d36ca with SHA-1 d4c2644086 is in history

Change-Id: Iefc6eef34021ae6e73d6b78284f62d66b041b6b8