Merge "Revert "Fix permission on TM#isDataEnabled"" am: 469e5b3317 am: 3033b15191 am: 9ad1f6565e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a1a974bd0456efbf92a1be1fbc5ace38499e636