Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.553' am: 7e249f0936 am: 6774a2ad07" into udc-d1-dev-plus-aosp