[automerger skipped] Merge "Switch emulator to 5.10 kernel (GKI 2.0)" am: 89e83dc8ec am: cad76386c4 am: 8a1baea811 -s ours

am skip reason: Change-Id I1470ca760cc453e2a87bd316b46c86270a2928b4 with SHA-1 c4b4fcbcf2 is in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1534263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f51f9046a53a6fe855bd4e687ab920acf556c31