Merge "SF: Flatten display containers" into tm-dev am: 585d10e600 am: 2ed4ac9000

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

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