Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f2519abc am: 18140a6784
am: cc778dae0d  -s ours

Change-Id: Icc78af1d4706a81ba7f4151201e3256b0491f1c5