Merge "Add non dangerous read phone state permission" am: 12c048e406 am: efd83737ab am: f987679c5d am: 7042bccf79

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

Change-Id: I7dc136cd80291783306c2218c633a137bfbc2111