[automerger skipped] Merge "If FEATURE_TELEPHONY_IMS is not available, don't...
[automerger skipped] Merge "If FEATURE_TELEPHONY_IMS is not available, don't spin up IMS" am: 87155f00 am: 0aaa43c2
am: 127da2cb -s ours
am skip reason: change_id I7a722b274d7cf3d138d120268aab08263bdf5a06 with SHA1 3a0daaa3 is in history
Change-Id: Iafb73540d4606261e8206e5ec558e2045c656452