Merge "MediaMetadata2: Remove radio constants" into pi-dev
am: b466a4c7da

Change-Id: I6e19d3f6fce8fb4dd11e4994f8cbce7850eee369