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

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

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



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