Merge remote-tracking branch 'aosp/upstream-master' am: a742137af6 am: 98f13a6355 am: ec66c3d5b4 am: 473e4fddaf

Original change: https://android-review.googlesource.com/c/platform/external/timezone-boundary-builder/+/1733814

Change-Id: Id2680d68aef514806c2b9176041023d042f80df3