Merge "Fix annotations in ImsSmsImplBase"
am: 90f4c2abe4

Change-Id: I81e572a926e92d75d83fbf3b169772635c733c15