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 am: 377e0e97 am: b2b60587

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



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