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