Merge "Bettern handle NPE in RcsTestApp ChatActivity" am: cbc2202ae6 am: 9122c4bb01 am: 679fc54465 am: aa8859db71

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1607016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I857ac82ca0040005d0d09c8ce68578e6354abe32