Merge changes from topic "cherrypicker-L07000000954433404:N02900001263050849" into tm-dev am: 478d0617d6 am: 40f3bc3eee

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

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