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

Change-Id: Iae3f60a06b93dd043e7f465f5b3c4c474f26ff6e