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

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

Change-Id: I0aa25b0e87987b4aa259972f91ae8dd81e9662e2