Merge changes from topics "cherrypick-pixel-format-metric-r71x1vhwrt",...

Merge changes from topics "cherrypick-pixel-format-metric-r71x1vhwrt", "cherrypicker-L69100000963159156:N69100001407413784" into udc-qpr-dev am: 615b4344

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



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