Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.035' into rvc-dev

 Conflicts:
	conf_files/sm6150/sm6150.mk

Bug: 152368391
Change-Id: Iab4202226564ca6b88bee627fa0130cd094a6b49