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

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

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



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