Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.R1.09.00.00.529.057' into qt-r1-dev

Bug: 136707337
Change-Id: I6a5b2d92c938379c676c835037ed9c71cfd59f13