[automerger skipped] Merge "RESTRICT AUTOMERGE Avoid the scenario Where taskdisplayarea is null" am: 493baa12 -s ours am: 67ae0a36 -s ours am: 90029bae -s ours am: fe2d2396 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib8a65a42e515a6de14abea6520aa17b506f20232