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

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

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



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