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

Change-Id: If8c3b219dd010c164a6f9e1a08bc992fa5145112