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

Change-Id: Id71b5201fe8b98436250da718bc20ca0f77469db