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

Change-Id: I7cfe6e3f7de40146dd3d80c4df3d7220f6ea1d95