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

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

Change-Id: Iea34290eb9a7f0cd97a7ebc5206677cf3b7d735b