[automerger skipped] Merge "create getModemEnabled function in PhoneConfigurationManager" am: 8bf13f06d7 am: cc64f34a7b
am: c24a059c5c -s ours
am skip reason: change_id I7b22c5b0dbe95a8e5be2e0cbf3199841d275dac7 with SHA1 cc07b9ed2d is in history

Change-Id: I89bbe27ebe69d3d607810a280d1199317b3ca7f9