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

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

Change-Id: Ie4b0b6d4a5f94da4c2f76888ad6cfa5cd29b21be