[automerger skipped] Merge RQ2A.210305.007 am: 63ff5a19c1 -s ours am: a2779659be -s ours am: c23e0f9090 -s ours

am skip reason: Change-Id I34dcb929ff4fa45d0365fc7b6b252916b722e3db with SHA-1 a3b70e9ef6 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Traceur/+/1613687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65664cd39143c65f2a93e8cf3ef147d0d38b9f8f