Merge "Fix annotations in ImsSmsImplBase" am: 90f4c2abe4 am: f9f5ebd9ca am: 0b37c14f40
am: 5525fd1924

Change-Id: Ia1f86f758e81e50c0a51d59d74d21fb1f695be67