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

Bug: 210578498
Change-Id: I83805c21352a55e92cec5258474192706ce7f392