Merge "Merge "Add PlatformCompat permissions to TelephonyProvider" into rvc-dev am: 81866d4149 am: 16c872ce5c" into rvc-d1-dev-plus-aosp am: 6a411d769c

Change-Id: I33d7eb84b0992477df6bdb385c6705531e4c8039