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

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

Change-Id: I34e49d78d5c6d3756df533af15716d21263a8c31