[automerger skipped] Merge "Revert "[DO NOT MERGE] Transitions - Smooth out bouncer -> gone"" into tm-qpr-dev am: c0b0e7fa am: e1105155 -s ours am: 676c0af6 -s ours

am skip reason: subject contains skip directive

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



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