Merge changes from topic "flexiglass-container-config-b279501596" into udc-dev am: 92e7e120 am: 20c3d9c5 am: 84e136c8 am: 5b4f4aef

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



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