Merge "Cancel polling task after component unmount" am: 3862d22d0e

Original change: https://android-review.googlesource.com/c/platform/development/+/1815616

Change-Id: If897bc469c04123262e67807e05f74fdc5a50ac0