Merge "Delete 5.10-android12-{0,1}." am: 4a2f14b541 am: 06ed3c3e09

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Gki/+/1700119

Change-Id: Iaacb4f4e4aeb220e2ec8961b18276c5de082bffb