Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.478'

Bug: 261541074
Change-Id: Ia15f72b0ff85c1121a808a9379f1926b155797ea