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

Merge "Populate preferred frame timeline always" into udc-dev am: 9e9933f2 am: ecbd3089 am: 87a81d65 am: 11a3312d

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



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