[automerger skipped] Merge "Add OfflineLocationTimeZoneProvider app support" am: b05b4fde9c am: 22cef69a52 -s ours am: 609d72a961 -s ours

am skip reason: Merged-In I68f1afcac023a68c5485d4d6a927001dae51592d with SHA-1 d056575376 is already in history

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

Change-Id: I7ce3dcc0fee779a9bc289de7bff98fb96e985506
Signed-off-by: Automerger Merge Worker <[email protected]>