Merge "Refactoring to support PII changes" into sc-dev am: 12d9536886 am: 82456c8191

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/GeoTZ/+/14690872

Change-Id: Ibdec21d2e33b75b2c9f321721546c188e83de631