Merge "Move ExternalTimeSuggestion to android.app.time" into sc-dev