Merge "Revert "MediaBrowserService: Add a constant for suggestion keywords""