[automerger skipped] Merge "Fixed incorrect IWLAN service state in legacy mode" am: ee975390
am: 63195763 -s ours
am skip reason: change_id I60491e79b2af7b5076660f6f69984b10e12f1cce with SHA1 74d8ea72 is in history
Change-Id: I35112a97b46341a41087d2df0b8286a4206c9632