Merge "Change the permission for isDataEnabled for System API"