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

Change-Id: I00c93e3bed9f2458d311c32eb84433a2be457ce7