am fb120f7c: am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f

* commit 'fb120f7c2663a58ec12daf06563b1d27add19e94':
  b/17209397. NOOP getServiceMap() if we are in the tombstone app.

src/com/android/email/service/EmailServiceUtils.java

@@ -543,6 +543,12 @@ public class EmailServiceUtils {
             }
 
             final ImmutableMap.Builder<String, EmailServiceInfo> builder = ImmutableMap.builder();
+            if (!context.getResources().getBoolean(R.bool.enable_services)) {
+                // Return an empty map if services have been disabled because this is the Email
+                // Tombstone app.
+                sServiceMap = builder.build();
+                return sServiceMap;
+            }
 
             try {
                 final Resources res = context.getResources();