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

Change-Id: Id82363ca09cdcad09770485dbb04204cee6e52b8