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

Change-Id: Ic9780a11f1c3d3bbcbd8c5be350176507c62c685