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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifaf1203810f2ac6640added9ff41fcf3dda26237