Merge changes from topic "am-0bc6a3da35c34e7da6d874a3480a9314" into pie-cts-dev am: 4cfdffcf38 am: 6d83851dc3 am: 8e150dbc83 am: bd90c0d898 am: 43b8793507

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

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