Merge "Reorder TelephonyPermissions calls for carrier privileges" into rvc-dev am: f07d289b am: ddd636ce am: be962567

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

Change-Id: I65ce30508cc91caca5cbcc793337579b19a05fa8