Merge changes Id44d3533,I5077a770 into main am: e1c685f2fe

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

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