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

Change-Id: I11f2a0e3d6af1b9bf649aaed543f99e68af99043