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

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



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