Merge "Rename AutoTime and AutoTimeZone APIs" into rvc-dev am: 1dbdcbc689 am: 08bd24cb47

Change-Id: I76680cbe362a61185a5f336fce1b9738c3e0b000