Merge "Remove code that break androidx build." into main am: 3067440ae7 am: dbeccdc0f4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3197416

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