Merge cherrypicks of [12777987, 12777647, 12777988] into rvc-qpr1-release am: ee6515ae4c

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

Change-Id: I013d204885b5298132d6b599d24c728b20d3f7b2