Merge "SF: Flatten display containers" into tm-dev am: 585d10e6 am: 7b36432e

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



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