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

Bug: 130581568
Change-Id: I4c99f34745058a50f9e141dc5d1587617b199c37