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

Change-Id: Ife661df0235fdee6828b1f96b885ce2536ee08b5