More refactoring to make adding a secondary easier

More tidy ups from reviews.

Bug: 152744911
Bug: 149014708
Test: atest services/tests/servicestests/src/com/android/server/location/timezone/
Change-Id: I510e492ffac57cad6cb67c61a76c6c874d7c9686