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

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



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