Merge "Fix nascent timer never get removed" into sc-dev am: ea3d717053

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

Change-Id: I1ea9133133dadb7a4c2f271e551336f003121417