Merge "Merge "Fix NPE on TaskFragment" into udc-dev am: b703d3e7 am: 329676f0" into udc-d1-dev-plus-aosp am: 91569201

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



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