[automerger skipped] Merge "Reorder ImsFeature initialization to handle STATE_READY" am: 3876ca9d81
am: 247ecd6f7b -s ours
am skip reason: change_id I562246c1995365308d26f44683f75bf5c46b7405 with SHA1 68cc1aef38 is in history

Change-Id: I1876b72a5e7413ed43f8f43e2116b16a769e30d6