Merge "Better handle MSIM DDS changed event"
am: 4418eb4ddf

Change-Id: Ibadbaec61808e571ebbd1c0c2ac90cf3c5141a57