Merge "MediaBrowserServiceCompat: Add a constant for suggestion keywords"