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

Change-Id: I0701d5068cd2cd333ecff85b3bd4fe3a41248e47