Revert^2 "[Catalyst] Support settings service"

0fff46ec0d47f187f2b29cf3777be5434e90cb09

Change-Id: Ie82d17dd59de4f6451b8184f092a0af8e7556bfe
2 files changed