Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d0638435 am: b5f2519a am: 18140a67 am: cc778dae -s ours Change-Id: Icc78af1d4706a81ba7f4151201e3256b0491f1c5