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

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

Change-Id: I05f01ac3dbf1ac4b412dbbc3efd49c380d27c124