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

Change-Id: I476d7486c27a3c8628272b540695edaf4a63b33a