Merge platform/external/python/python-api-core v2.3.0 am: 4e81cd9cc2 am: 95950852f5

Original change: https://android-review.googlesource.com/c/platform/external/python/python-api-core/+/1931601

Change-Id: I0a28ae4d9002c60c8a8d0b08dc0b0bcefd8c64d9