Merge "[ATMS] Remove some dead code from Task" into tm-qpr-dev am: c893507c66

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

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