[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "cherrypick-pixel-format-metric-r71x1vhwrt", "cherrypicker-L69100000963159156:N69100001407413784" into udc-qpr-dev am: 615b4344 am: 02f2504f -s ours

am skip reason: Merged-In I3b425089bef72e66af69dd4b4fd28211ca41b223 with SHA-1 2a8d8834 is already in history

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



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