Merge changes from topic "flexiglass-container-config-b279501596" into udc-dev...

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

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



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