[automerger skipped] Merge RQ2A.210305.007 into stage. am: 43670af5 -s ours

am skip reason: skipped by user delphij

Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/13724596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6e5bedebd14a314242e32a615bdd809d328d27a