Merge "Create Device configuration for per feature binding in ImsResolver"
am: d95c1438c7

Change-Id: Icdad11cb22518959557b17eacefb5d1b1a9081f1