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

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

Change-Id: Idc6271caf91242be8b8229036c1576877890df90