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

 Conflicts:
	sdm/libs/hwc2/Android.mk
	sdm/libs/hwc2/hwc_session.cpp

Bug: 148752159
Change-Id: Ic0cd0d299afc5a897d6ea2074f1e882565d53e93