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

Change-Id: Id08aa3d413e3325902b8da33cd9cff42e59455a2