Untangle the statusbar for dual sim

This is just enough to get the statusbar to not forceclose.

Change-Id: I9be26ba6ec6b51649eab0ca563a488a1394c6eea
Signed-off-by: klozz <xxx.reptar.rawrr.xxx@gmail.com>
Merge https://github.com/XPerience-AOSP/android_frameworks_base into HEAD