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

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



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