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

Change-Id: Ied6609e72e93fadb2696fb333cf3668ef3afff7e