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

Bug: 187909050
Change-Id: I8c0f2283f0badb512b6e83092f0842b13827e064