Merge "Call Forward Setting preference is disabled when setting an empty number" am: 9ef702e8d3 am: 6efd47d473

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

Change-Id: I28ece20b45535136c98300f5f445f237ef80ecf9
Signed-off-by: Automerger Merge Worker <[email protected]>