Merge "Set better defaults for layer stack and oriented display space" into...

Merge "Set better defaults for layer stack and oriented display space" into tm-dev am: 87d026ac am: a655bfe8

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



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