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: I77f0c8bc37197b6b01520be13356fcff33b8a6fa