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

Change-Id: I576a3d67755efab9131dc8188d2911bdd497cf47