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

Bug: 261541074
Change-Id: I755853b077712d2cb154326ab8b0f1ddcec13b05