Merge "[flexiglass] Removes support for multiple containers." into udc-qpr-dev am: 54a63492

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24233975



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