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

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

Change-Id: Id740278bfbcae8754daa99a5ed34ebca8949d8be