Merge "Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018 am: 9fd8e49fe0" into oc-dr1-dev-plus-aosp
am: b13b4a385a
Change-Id: I263f7870b59e94ff807d09943bb4a2ee65cfd152
This commit is contained in: