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: 626fa3b4 am: e606dcce am: 7a51012c

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



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