Merge "Reorder TelephonyPermissions calls for carrier privileges" into rvc-dev am: f07d289b51 am: ddd636ce01

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

Change-Id: I0c216f23c927c81e48b3e5ffe2cf482690b04706