Merge "Add @hide to Context.APP_SEARCH_SERVICE"