DO NOT MERGE - Merge tm-qpr3-release TQ3A.230605.010 into tm-platform-merge

Ignore-AOSP-First: bulk merge from tm-qpr3-release
Bug: 279962103
Change-Id: I53fc31c58f050321b0fcb8010689e95e2b91bb4f