[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: f6fedcd1 -s ours am: 9006efe1 -s ours

am skip reason: Merged-In I367b06ea5f1ee7c222a4ffb77f2e7b23268d7d43 with SHA-1 d67e3d90 is already in history

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

Change-Id: I92c39098d8a9d9357200e3af5cf755390e0273ac