Merge "Use the task windowing mode to determine inheritance" into udc-qpr-dev am: 0f78d29c

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



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