[conflict] Merge "Fix untrusted embedding visibility in multi windowing mode"...

[conflict] Merge "Fix untrusted embedding visibility in multi windowing mode" into tm-dev am: 721634a9 am: 930a71f5

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



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