Merge "Track renames in system/timezone" into sc-dev am: d094141baf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82c6d402af7f9a5c03e3c6b351c4c5cee84f3662