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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17844a52b88e389120a35786b3f662ed13a9d2ea