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

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

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



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