Revert "DO NOT MERGE) Fix gradle build" am: 9ee8d13d78
Revert "DO NOT MERGE) Fix gradle build"
am: 9ee8d13d78

* commit '9ee8d13d7868f5d02410cacbb770bde514422d42':
  Revert "DO NOT MERGE) Fix gradle build"

AndroidX/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,androidx/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,aosp-mirror/platform_frameworks_support,AndroidX/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,aosp-mirror/platform_frameworks_support,AndroidX/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,aosp-mirror/platform_frameworks_support