Merge "TextClock registerContentObserver with UserHandle"