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

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

Change-Id: I89d8c07a5006b954be8b31810ce6f2e26acd598b