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

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



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