Merge mainline-release 6664920 to master - DO NOT MERGE am: b9820803f8

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

Change-Id: Icbf20571995c2863e42aa82343a0b2faa6e07e4a