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

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



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