Merge "Don't hide baseband on dual sim devices" into cm-11.0