Merge "Unregister handler for multi-SIM configuration change"
am: afeccff350

Change-Id: I65d81489afebdfa332bb38be81bd88845993ccf4