[automerger skipped] Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." am: 6ddfde96fd am: fd5d074f49 am: 914861c2e0
am: 281e4ef4ec -s ours
am skip reason: change_id Idf7babd3ad0bcbde04b2a92761acf31ec9776a50 with SHA1 afe7d79964 is in history

Change-Id: If754c862285ca90483c3beb7fd0d5bbb9ff55cde