Merge "Change android12-5.10 to android13-5.10" am: b3455f4a2e am: 2e3eb8434a am: dc53430c19 am: 6ec722358f

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

Change-Id: I4edabcdfbbf1cad1fff3daab6680eac7ebc00d46