Merge Android 12L Bug: 222710654 Merged-In: I5e80107e6d535f774a45ab2fc4f792f70702ee21 Change-Id: If6fffe41e60ad43ed07cfa666aa45b1984b9687c