Merge "Remove PhoneStateLister#onOtaspChanged" am: 0d7a5dc2ea am: 6846fe997c

Change-Id: I8129f2a112daeb63e23535edb5155ceb85c2ece7