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: 5ee546f8 am: c9da714e

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



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