Merge "A reference AOSP LocationTimeZoneProvider/Service"