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

Change-Id: Ie7ec40e4c37657a9a811fed180d56413213d85ef