Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.021'

Bug: 149660093
Change-Id: Ieb49e3101614c0fb467237ac3320ab567fc1fe3c