Merge "Services exit fg when bg-restricted app leaves top"
am: 4221333afe

Change-Id: Ifb353d3d73268215d4c3832c81eeb11c7635c02b