DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: I53a537e688ffb51fff268973d52aa85afa156884 Change-Id: Ic330d48a12f03ecfccefc8ab9a6efd2437f4f367