Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.028' into rvc-dev am: 624266e046 am: afbb624a0f" into rvc-d1-dev-plus-aosp am: 988f207031 am: 278a98ca26

Change-Id: Ibd1de5508f56a050ceff9bc9013b275259604047