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

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



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