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: eec13bca am: ab2e7d0a am: 08f2edee

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



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