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

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

Change-Id: Ife443057153866c806b133c15ab2aa5020bd4e77