Merge "Merge strList only if the list is not null." into main am: 821dadb24b am: 0007fa595e

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3321253

Change-Id: I0781b82322ddf6a88d32445df823f13be2c43377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>