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

Bug: 131711189
Change-Id: I281a4ad98420fee2011d443c68104b4dc34a833f