Merge "Allow modify phone state permission" am: 56f6d8d8a9

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

Change-Id: I39c70722d7ba70e49c98e3758fa8b7f3a6662034