Merge "Merge "Remove configuration of com.android.geotz module" into sc-dev...

Merge "Merge "Remove configuration of com.android.geotz module" into sc-dev am: 9cdd6897 am: 1c1c7ec7" into sc-v2-dev-plus-aosp am: b4de05e7

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

Change-Id: I1a90e29c75c58e7d6769adb501f5b6c9029dd9f1