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

Change-Id: Ic3afe254a5fc70e851f2ee732207b1ce4a168660