Merge "Switch emulator to 5.10 kernel (GKI 2.0)" am: 89e83dc8ec am: cad76386c4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3efdf9a5c98f5d0bf3607c2ae7e2a7ec22d922a6