Merge "Fix issues with test mode for call composer" into sc-dev am: 65f6b375e0 am: 9fa6871486

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

Change-Id: I921d5fff58e9cdb6df7185a1325123a25421bed5