Merge changes from topic "bouncer-scene-throttling-b280877228" into udc-dev am: 637fb749

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



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