[automerger skipped] Merge changes from topic "am-f886af44f7a34489925cdf8a8017a7fc" into android13-tests-dev am: 1979ecacbc -s ours am: 58a4c33f5c -s ours am: 54f558317a -s ours am: d428949487 -s ours am: 132e405a15 -s ours

am skip reason: Merged-In I09d3297f64711c830957ea523a95740db208e047 with SHA-1 018420bc70 is already in history

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2730533

Change-Id: Ic6f8ab9afa425c485dc2ab0866d72831c35001ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>