Merge "Don't bring child to top if fullscreen task open" into udc-dev am:...

Merge "Don't bring child to top if fullscreen task open" into udc-dev am: bb4a8549 am: 31e152aa am: 9f26bbe2

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



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