Merge "Update instructions to track code relocation" am: 55490e99d3 am: 31eaacc640 am: 158d4ae205

Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1367127

Change-Id: I45314d489c19cfe35063c3a70e7ede74891c7e77