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

Merge "Populate preferred frame timeline always" into udc-dev am: 9e9933f2 am: 8bd95f85 am: 2f2129a7

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



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