Merge "Update Android from 2020b to 2020c" am: 4b0ce084d4

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

Change-Id: Idc86d2a9aeafcbd9b2202a57544f6ecd5adf778a