tree c494264c83eb203863462918abfd54b44c9902a6
parent 3b2c8b7687fdb2d9942085b86c047955acad171c
parent bbb0f8e68c84fcd1124e4005b8cf099b09de9669
author Xin Li <delphij@google.com> 1665082961 -0700
committer Xin Li <delphij@google.com> 1665082961 -0700

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

Bug: 248070379
Merged-In: I0634a7cf0c05e69f66c882158eb5f3fd1431bb7e
Change-Id: I4877b03334fc28c8bf902822da22dd6fcef8f5e9