[automerger skipped] Merge "Move sidefps bouncer logic into interactor." into...

[automerger skipped] Merge "Move sidefps bouncer logic into interactor." into tm-qpr-dev am: e871505c am: 44383520 am: 25148f07 -s ours

am skip reason: Merged-In Icc7065cab47b8adb74284715ce2813822d070c03 with SHA-1 4588c576 is already in history

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



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