Merge "Ensure PhoneConfigurationManager registrants are cleared after testing" into rvc-dev am: 7548817b5d am: 6a4ff290d7 am: 36b1123a19 am: 9b09ead727 am: 26f56453da

Change-Id: If55369412a78d31c8682ed967cdb9eb9427dfdb9