Merge "Cleanup python version properties" into main am: ebb5cce5f7 am: 3c07a2a739

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3518392

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