Merge "SF: avoid rearming Timer during cancel" into rvc-dev am: 0f083b8f33

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

Change-Id: Ic6d7ffd2a6cd16b0d2696ae1b582911d4c728191