Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev
am: c4ca1b5677

Change-Id: I81a50649ba59d28fdfc9a7b8381bcaf346555a3a