Merge "Fix overcounting after end in case of incomplete callbacks" into tm-dev...

Merge "Fix overcounting after end in case of incomplete callbacks" into tm-dev am: cd106a5a am: 7dbe6c19

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



Change-Id: If8feb0f3b0d4269014d18950a892b6ea6b5fa25d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>