Merge android13-gs-pixel-5.10-tm-d1 into android13-gs-pixel-5.10-tm-qpr1

Bug: 233569354
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: I321ed3a3b24a1373ffa2828f88cb39e6a9385719