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

Change-Id: Ibcdf9922d0be31508f22cee3fc6e5b76d26f1df7