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

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

Change-Id: I77586e0a9e4e4e7b1cdd62c2a547f31ef80103e7