Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.553'

Bug: 276396791
Change-Id: I617782a08125e7a9def756bb20e60dc515776a30