am 2e503ed1: am 075dc269: Merge commit \'211dda02\' into mnc-dev
am 2e503ed1: am 075dc269: Merge commit \'211dda02\' into mnc-dev

* commit '2e503ed140b096c7ee2109235d6c7a9c064fa4fa':
  Gradle build fixes

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