Revert [Telephony mainline] Add SystemApi and NonNull annotation am: 7cb5ca8e am: 2a28f867 am: 94179e37 Change-Id: I6b218dc209d00e18eef4e322eb864c5372d8eeff