[automerger skipped] Fix TzIdProtos TimeZoneReplacement traversal logic am: 66751582b7 am: bf3146315b am: 1359190156 am: 837c4efa47 -s ours

am skip reason: Change-Id I54b3a6ed1a93540b0b3cd7da0f840fba6e26d564 with SHA-1 afc4a9fbec is in history

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

Change-Id: I8d896c81001af0835edeb79c07bcbbd915146459