Merge changes from topic "heif-support-by-hevc" into udc-dev am: f44bc76e

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



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