Merge "Overriding the default TextClock and AnalogClock behavior to avoid RPCs on main thread during onAttachToWindow" into main