[automerger skipped] Merge "create getModemEnabled function in...
[automerger skipped] Merge "create getModemEnabled function in PhoneConfigurationManager" am: ec9a5ea8 am: 6790deb3
am: 3469d45d -s ours
am skip reason: change_id I3eb53f8b0ecac57a015ad43e44c7bbfbe17eed8c with SHA1 187f9f97 is in history
Change-Id: I83e725657adaa6bb9aead6a318b20dbe339a1118