Merge "heif: add new file and mime types to MediaScanner -- DO NOT MERGE" into oc-mr1-dev
am: 1ec1ab6803

Change-Id: Iec7567b12486593631a1cb48523d1fa19382af80