tree 1254a9d0fabe7a3aac3634a4d88df223a5bf5745
parent 50bb4d0646eb0ff5a7e004f88ae6b34d1596afdb
parent 42ffe8be7f6d6c6a793b18e5243f0d2556d431d5
author Treehugger Robot <treehugger-gerrit@google.com> 1679948154 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1679948154 +0000

Merge "Add new config to combine unavailable and unknown option" am: a176870d4d am: 42ffe8be7f

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>