Merge "Populate preferred frame timeline always" into udc-dev am: 9e9933f217 am: 8bd95f85e0

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

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