Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R2.10.00.00.685.011' into rvc-d1-dev

Bug: 157858241
Change-Id: I3424869edda97343f9d5d08353c657714567cd13