GitLab

This CL adds the remaining desks containers in preparation for
using them in the next CL.
This CL also makes sure that the correct container IDs list is
used based on whether the Virtual Desks feature is enabled or not.

BUG=866622
TEST=ash_unittests are passing.

Change-Id: I5919b362b484a2eab13d4d6243bdbdc9c10ef442
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1568766Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Mitsuru Oshima (Slow 4/22-26) <oshima@chromium.org>
Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652850}