Merge "Add new config to combine unavailable and unknown option" am: a176870d am: 42ffe8be

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



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