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

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



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