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

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

Change-Id: I11ffa9255bec6633f02442faf3c67bb1eac45288