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

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

Change-Id: Iac2f13d0f71f3873be172ff0404df528bddd6637