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

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



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