[automerger skipped] Merge ab/7061308 into stage. am: 90add233cf -s ours

am skip reason: Change-Id I98bc019b3729f08421c7d52ceb837d5f64d6f8ac with SHA-1 e414b8ddd4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7f3137a69d77c2948f518d734f44c371bfacbb3