[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: fe2d2396c4 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1794209 Change-Id: Ib8a65a42e515a6de14abea6520aa17b506f20232
This commit is contained in: