[automerger skipped] Merge "Create Device configuration for per feature binding in ImsResolver" am: d95c1438c7 am: c59a4a10df am: c49551f9ce -s ours
am skip reason: Change-Id I162011d7cf05e6e690fd8f65259f2463111517ba with SHA-1 24c2999af2 is in history

Change-Id: Iea1e1f9eac14eefb39bf81f4aab4d259b09910e0