Merge "Merge "Rename AutoTime and AutoTimeZone APIs" into rvc-dev am: 1dbdcbc689 am: a1899ef915" into rvc-d1-dev-plus-aosp