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

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

Change-Id: Ie08bb7edf5624f40c26a3d14671a8e37b0a0d979