Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev

Bug: 188781413
Change-Id: I952940e51d1b127472a65b827d82ded0f8c350ed