[automerger skipped] Merge "Check null taskInfo for occlude-by-dream" into...

[automerger skipped] Merge "Check null taskInfo for occlude-by-dream" into udc-dev am: 7cfd239b am: ffaef0c7 -s ours am: 8625db5a -s ours

am skip reason: Merged-In I731f5f10abfcc47e8a54bfa07445f25c2eb977b0 with SHA-1 f293a972 is already in history

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



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