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

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



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