Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.370' into qt-qpr1-dev

Bug: 146991028
Change-Id: Id9fd1c22aca5b74bc8842806232c78e2ce98505d