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

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



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