Merge "Add new config to combine unavailable and unknown option" am:...

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

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



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