Merge "Fix NPE on TaskFragment" into udc-dev am: b703d3e7 am: 329676f0

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



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