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

Bug: 223735970
Change-Id: I42c534f8b40958aed62318086e536c0498b1d7cd