[automerger skipped] DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 6ec41b66 am: c9a60589 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5b422307f788643656aa31f81521356d31677841