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

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

Change-Id: I759014bf7920c023d790e83208b212f4aeef383e