Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: 2e421e7755" into rvc-d1-dev-plus-aosp am: 0ed39094ed am: 7a0b913aed

Change-Id: I6e6eb499ad98844e649d98eed36fd05deefb41f5