Merge "Merge "Add PlatformCompat permissions to TelephonyProvider" into rvc-dev am: 81866d4149 am: 0980552cff" into rvc-d1-dev-plus-aosp