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

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

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