Merge "SF: avoid rearming Timer during cancel" into rvc-dev am: 0f083b8f am: b937c7e2 am: e4d37f62 am: 222b9a75

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

Change-Id: Ibdce2eb6a9d68caab96c773aa7fc263ef6af7583