[automerger skipped] Merge "Do not reuse phonestatelistener" into qt-dev-plus-aosp
am:898462bb57
-s ours am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA19bc2a584f6
is in history Change-Id: I0a694c44fffba88e4728b53a09ba469445a1a5f2
This commit is contained in: