Merge "Change the permission for isDataEnabled for System API" am: fb6b0d695e am: ec28a30234

Change-Id: I2358cd5b8a4ecf1426f4790de8a821678551f9a4