sepolicy: remove stray + in type statement

Change-Id: Ic34c9ae32658541064a63153612145c6fd3d55b3
Change roaming protocol for "telenor.smart" to IPv4

* As per info on telenor.no

Change-Id: I7d5febd07e362d38880b454a45a3b692f52a954c
Merge remote-tracking branch 'cm-12.0/cm-12.0' into cm-12.0