Merge "Fix annotations in ImsSmsImplBase" am: 90f4c2abe4
am: f9f5ebd9ca

Change-Id: I84f58daaf2ba037ea9a4feac97006ce848eadf4a