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

Change-Id: If3286b50bec593f19a39528b8ff98d363ae0a5de