Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 4e0527be03 am: 38580c7bcb" into rvc-d1-dev-plus-aosp am: db81644d4f am: 8e4b0f823a

Change-Id: I4b55de09fc9f7945988d1f01441b6b2322728d42