Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.1.R1.09.00.00.461.057' into pi-dev

Bug: 117197316
Change-Id: Ic7edf428a98b5ead066594264c67a93e51e6e2f6