Merge "Adds @hide ImsResolver API and device overlays (2/3)"