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

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

Change-Id: Ic7c6ffe1943ccbe7d79633fc6d2f29ef6f4e75a1