Merge "Fix CTS failed on ImsServiceTest#testProvisioningManagerNotifyAutoConfig" am: 685f900c47

Change-Id: Icf203396e5126af84324dcedb3e9ebf146e382d6