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

Merge "Do not propagate always-on-top config to child containers" into tm-dev am: 0e52eb3a am: 108977f3

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



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