Merge "Rename android.util.TimestampedValue to android.os"