[automerger skipped] Merge "Adds the old timezone to dumpsys logs after a...

[automerger skipped] Merge "Adds the old timezone to dumpsys logs after a timezone update." into main am: dfe71e56 am: 1848fcf9 -s ours

am skip reason: Merged-In I18664e3465c0c6145a87010e9928e10167b15567 with SHA-1 e6a38a55 is already in history

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



Change-Id: I32a3e2ee3d5e8d5e96129dc9e49f2c2dfe08d9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>