Merge "Ensure PhoneConfigurationManager registrants are cleared after testing" am: 365e41d384

Change-Id: I94873e0d3bf25ff1690d11d4ccb5070362dbf30f