Merge "Suppress showing "Invalid Validity Period-1" for sending messages" am: 8daa4a1389

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313804

Change-Id: Ia96b9512685c243d46575c68ec2896af265075fa