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

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

Change-Id: Ia9e64a96785f8730caedf20d3cdd0ddf33ca972b