Merge "Merge "Do not propagate always-on-top config to child containers" into...

Merge "Merge "Do not propagate always-on-top config to child containers" into tm-dev am: 0e52eb3a am: 9d1a5663 am: 72267a45" into tm-qpr-dev-plus-aosp am: d8a74e48

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



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