tree 299f5f3254c93022bfed2288c04cabc84f579648
parent 6a21b5f73737b1eb56ba6b0c42e078214bd2e171
parent f6c75607cc2c03ad6491a7f562c1db19e1ccf12b
author Xin Li <delphij@google.com> 1665083016 -0700
committer Xin Li <delphij@google.com> 1665083016 -0700

Merge tm-qpr-dev-plus-aosp-without-vendor@9129937

Bug: 248070379
Merged-In: I36eb223602fc67951adbe8d6dcd179db2a01476e
Change-Id: Icf0b03ab70e7d48bef7b9d1a4bd9e03a0430fddd