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

Change-Id: I668e161066178503e55b7f902d134b2bfcb7d078