[automerger skipped] Merge "improve mism support for phonestatelistner" am: ed4d220c97 am: a05023c222
am: 5cf7557e3f -s ours
am skip reason: change_id I1af07798d7982575cccc27462af179182c033409 with SHA1 0ebc9b67e9 is in history

Change-Id: I313b191c3360897483f41a03cde1db92264677e9