Merge "Ensure PhoneConfigurationManager registrants are cleared after testing" into rvc-dev am: 7548817b5d am: c24592d022 am: c8e7cb856d am: 85e40cc586

Change-Id: I0ffbbbabb5495cd3d3b345ad9bb6221d5f170a70