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: bebec760 am: 979edfcb

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



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