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: 9d1a5663

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



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