Merge Android 13 QPR2 Bug: 273316506 Merged-In: I4c7299077b97443e0db1675b800a546949dff1e8 Change-Id: Icaba2db6ef71eb4a77eb48a02e8a69601448b775