Merge changes from topics "b270612751", "kFrameTimelinesCapacity" into udc-dev...

Merge changes from topics "b270612751", "kFrameTimelinesCapacity" into udc-dev am: e4eb2742 am: bdd404f8

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



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