[automerger skipped] Merge "create getModemEnabled function in PhoneConfigurationManager" am: 812ae785fe am: ad9f8ed1e3
am: 0925b04f17 -s ours
am skip reason: change_id Ib8ef7887c84c5ec5e67478bb766dbeff7edb8594 with SHA1 ead6a26a00 is in history

Change-Id: I8cc856e7dce9033151051b851f5ad5723121a30d