Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.517'

 Conflicts:
	config/display-product.mk

Bug: 268269924
Bug: 269060134
Change-Id: I048fbe921e41a4c44e05da0977dc4f97ce8c9f97