Merge "Show containers in list new storage" into main am: 0eb513b2

Original change: https://android-review.googlesource.com/c/platform/build/+/3266997



Change-Id: Ib6d582ffa49b2a531b847c6a648b7f978b2597f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>