Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp

am: e61d3ff3d1

* commit 'e61d3ff3d131c2f28adee085557cd93853af5e72':
  Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.

Change-Id: Ia6f1c88bba68df6660d7e91e4bedebda22bcf5c5

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

@@ -2747,7 +2747,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
         final String[] packages = mContext.getPackageManager().getPackagesForUid(uid);
         final int userId = UserHandle.getUserId(uid);
 
-        if (!ArrayUtils.isEmpty(packages)) {
+        if (packages != null) {
             for (String packageName : packages) {
                 if (!mUsageStats.isAppIdle(packageName, uid, userId)) {
                     return false;