Merge changes from topic "flexiglass-container-config-b279501596" into udc-dev am: 92e7e120

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



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