Merge "Fix NPE on TaskFragment" into udc-dev am: b703d3e7 am: a282510a am: 9ce13dd2

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



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