[automerger skipped] Merge "RESTRICT AUTOMERGE Avoid the scenario Where taskdisplayarea is null" am: 493baa1280 -s ours am: 67ae0a366f -s ours am: 90029bae99 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I605df43397bd4ecfede9cc232db76c071aa3bf48