Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.343'

Bug: 146759211
Change-Id: I7e90b1f60353762b17bf0d1f5583767644cea12f