DO NOT MERGE - Merge RQ1A.201205.011 am: ca24924f05

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

Change-Id: I5eb976b704fc1e14deca8daa6c5e160742c67c2c