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

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

Change-Id: Ia177f6b1ce7c1c5d5034023e69fa7f15c6ce570a