Merge changes from topic "provisioning improvement"

* changes:
  Supporting moving from a single sim to a DSDS and vice versa
  Improvement provisioning in AOSP