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

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

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



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