Compilation fix for AOSP update

Fixed systemui and device crash on bootup in msim mode

Conflicts:
services/core/java/com/android/server/ConnectivityService.java
Change-Id: Idf836ec01e18f8e64c972e3a54b279618e4d6ed6