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

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



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