Merge "Remove py2 version block" into main am: 1f013529

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3467872



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