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

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

Change-Id: I000f82e40bc90d1fadfbb69d10990ccff057c87c