Merge "Tidy configuration associated with geotz" into sc-dev am: 8168766a am: 26cf681a am: e1168cd2

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

Change-Id: I3f92b4de89fa2d5c59af3fe4f0d5e1b901c07529