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

Change-Id: I92dc691dbb80a5c35a2f7fa3f6b1c2dd109de7b0