DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: I7c849655539ac60e48cf2b4c25b33a1d222a6cfe Change-Id: Ibef6b04503f846b0328b17f5aed3c59a7efe82a6