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

Change-Id: Id3f45ed62dbc459c1a067e57e711f3f773d84128