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

Change-Id: I2c04190edd969e63c5ffbf07eacc5b7e8b101c6e