[automerger skipped] Merge "Clean up old Context references in ImsConfig" am: a54d5e31e3  -s ours
am: cacc29957a  -s ours

Change-Id: I312b17cfe872dc4888ecb7b66d7430783123dd91