Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.265' into tm-dev

Bug: 223735970
Change-Id: Ib42d062101103f8c503681b56eb9e65cdf8b85c1