couple fixes for msim dual sim

Change-Id: I2bd9ebdd6fa147c67e397d4cc2db1f8bfc2f5666
Signed-off-by: houst0nn <houstonn@gmail.com>