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

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

Change-Id: If420d4df57710175c396ccaed8495d5a815a95b1