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

am skip reason: subject contains skip directive

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

Change-Id: I0101d8669d2ec4b10b4ebb6f318e300b49012bfa