Merge "Remove PhoneStateLister#onOtaspChanged"
am: 0d7a5dc2ea

Change-Id: Ide424903fac31549a660ded17d24c14fa4e5db5b