[automerger skipped] Merge "Services exit fg when bg-restricted app leaves top" am: 4221333afe am: 8059c8ea7d
am: 994266d277 -s ours
am skip reason: change_id I6d0e954c961f7c547c1f5d98e3926586f3071bca with SHA1 8d74de4aca is in history

Change-Id: I8e68d545b9fbc646769126c80c3894959beb7ad1