Android 12.0.0 release 26
[automerger skipped] Mark ab/7061308 as merged in stage. am: 6cc4491a0c -s ours am: 461b6becbe -s ours

am skip reason: Change-Id If5ae74f91003e5833867f94b4b1c5cee4ee08206 with SHA-1 aefbc692ad is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I743ce25b43b75e9c2ee24580749a292608d16313