Merge changes from topic "bouncer-scene-throttling-b280877228" into udc-dev...

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

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



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