[automerger skipped] Merge "[Settings] Changes for supporting replacing...
[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d5 am: b35536dd -s ours
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a is in history
Change-Id: I220736e2850a956d44d441270755d4edcce9757a