[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8 -s ours am: 9be78b056f -s ours am: 27ac6ed0a3 -s ours am: 4667eae476 -s ours
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62 is in history
Change-Id: Ife5a6853f1e7f2ff5f12af9712d51b8028d76905
This commit is contained in: