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

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

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