Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C3.08.00.00.787.021' into sc-dev

Bug: 185197826
Change-Id: I2466b46543d6daa92fa6d6660eaafd8e9157eef3