Merge "Revert "Revert "Fix permission on TM#isDataEnabled""" am: 2b79ba7f42 am: 47e1305bd6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fb6ff5923d029b367c754759f7b7deca7a63dfe