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

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

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