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