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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I473079801eee68e44af1025b63c58d9fcda22837