Merge changes from topic "128645056"

* changes:
  In PhoneSwitcher, retry RIL command if they fail.
  Rename non-opportunistic (nonOppt) to primary.
  Clear calling identity after permission check of setDefaultDataSubId.
  Rename variables in PhoneSwitcher.
  Clean up a few names of Telephony intent extra.