Merge tag 'android-security-10.0.0_r53' into staging/lineage-17.1_merge_android-security-10.0.0_r53

Android security 10.0.0 release 53

* tag 'android-security-10.0.0_r53':
  Remove unecessary locking to avoid dead lock.
  Fix bug of disabling grouped CBRS during profile switch on primary SIM
  Move permission checks out of synchronized block
  Guard ICC ID card string behind new identifier access requirements
  Guard ICC ID behind new identifier access requirements

Conflicts:
	src/java/com/android/internal/telephony/MultiSimSettingController.java
	src/java/com/android/internal/telephony/SubscriptionController.java
	tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

Change-Id: I12a0bf18b9a0ef68ccce6ee23294c11098547a7d