Merge "Refactoring to support PII changes" into sc-dev am: 12d9536886 am: 305d17088b

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

Change-Id: I9196e14331cb21f76136a9683c45fffedd94b07f