Merge "Reorder TelephonyPermissions calls for carrier privileges" into rvc-dev am: f07d289b am: 6eaa9681

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

Change-Id: If42cc7db2dcde2696a21ad07a33fa6c4304096a0