Merge "Remove PhoneStateLister#onOtaspChanged"