[automerger skipped] Merge "Change the permission for isDataEnabled for System API" am: fb6b0d695e am: ec28a30234 am: da7a8994b7 -s ours
am skip reason: Change-Id I3e7490aa5edd5ec83ff8149ac58715c018768e27 with SHA-1 8ee4e88b8c is in history

Change-Id: Ib9e36f50404996f427086a87ff9ba7ab7ce39dcc