Merge "Populate preferred frame timeline always" into udc-dev am: 9e9933f2 am: 61f8f905

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



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