Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager."
am: 6ddfde96fd

Change-Id: Id0b4e6388a93e0cdc142ee44fea087031098419a