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

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

Change-Id: I5dc25837f2336c884f5cc539faf1ce9efbd01d31