tree c6184d113e80be6df3fcfe2605c1da668ce711a5
parent c287072ef6608555eed47869182495a51b4bf08b
parent 6ace1d8a5a9572488481fae0323f1dd8f803d68e
author Xin Li <delphij@google.com> 1665082898 -0700
committer Xin Li <delphij@google.com> 1665082898 -0700

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

Bug: 248070379
Merged-In: I93dab0c5a25a1f623f250a3870d86f0e17272b23
Change-Id: I4b526e07f12b84275938937ac05de7caabfe145f