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

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

Change-Id: I9e4c4f81d39325aed171d41ca6dcc9d4651049cc