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

Change-Id: I4da91bcbf06afa9a210496531aa5ab7b82c23b2e