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

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



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