Merge "Whitelist MVNO type and data fields from permissions" am: 59f19a600a
am: b07ad61bec

Change-Id: I3a2490be6848c19139b017d5a4a3e74d223ea3ad