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

Bug: 276396791
Change-Id: Ia453654d13cf06f5d1cd724c0f4a642a246b801c