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

Change-Id: I7adaa72648126e068145ebfd1647e3531606bd81