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

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

Change-Id: I87797bdb7301903dc9d9fdb97dddbf5434ea8efc