[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 80d1724769 -s ours

am skip reason: Change-Id Id1351d1d694e96564317e12c79a2484fd33f762e with SHA-1 a49208f178 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2912b4d3c8e608139d49ea2739878e4f4775a5ab