Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549
am: b5f2519abc

Change-Id: I54c577f6c4bd68f6328572651315e056270ee807