Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 463d752f5b am: 6bedc0adc6" into rvc-d1-dev-plus-aosp am: 05c217277a

Change-Id: I154fd0ecae6459a6af8b91f9a304dd4f7b235750