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

 Conflicts:
	product.mk

Bug: 148752159
Change-Id: If80adce1029bebac88aa440b6b08613e3a5b535c