[automerger skipped] Merge "Add new IRegistrationManager for managing IMS registration" am: 3d8a0ce489 am: dc83a3b2ce
am: cbcf5bf47a -s ours
am skip reason: change_id Ia568dcd059c2bcef26462e808088901edf6b072f with SHA1 a9fcaac41e is in history

Change-Id: I71e5128b9b80678b0124c96500505c4500256eeb