Merge "Allow modify phone state permission" am: 56f6d8d8a9 am: 37a3ed2805 am: f7f152eaa2 am: 855061cc02

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

Change-Id: I3b3fe99462ce4e4752b3a7d77b7fa6f96546a8e9