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

Change-Id: Ic7d62884ba9421f905f8d9a95bd5bee733a2cb31