[automerger skipped] Merge "[flexiglass] Removes support for multiple...

[automerger skipped] Merge "[flexiglass] Removes support for multiple containers." into udc-qpr-dev am: 54a63492 am: 9aa11b39 -s ours

am skip reason: Merged-In I39cdcbecb936b64e55b40a04ea8ca897278fcf62 with SHA-1 7d07ad73 is already in history

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



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