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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61aed680909a2f17ad8a912f76dd6ffe1fc6b455