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

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



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