Merge "Make timeout optional for pausePolling & also resumePolling only if not started" into main am: 5428389cb0

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

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