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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf7e13c2e47e7096cbcac6e7f61ec50407dd27cc