Merge "[Bouncer] Move reset logic to end event." into tm-dev am: 277f9b3b

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



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