Merge "Not allowing foreground services to be cleared as children" into nyc-mr2-dev
am: c8278f35c7

Change-Id: Ic6cccd4760d102a1b69f664a99eb114d006f3d45