Reconcile radio file_contexts and a radio property with aosp

Change-Id: I44894a868448cf9cfb13869999d10cb10a1d0547