Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.243' into tm-dev

Bug: 223735979
Change-Id: Icfb53444f6c132cb46f0abeb9f29c4887d2405cb