Merge "Add Dolby Vision branding info into MPEG-4 ftyp box" into main am: 0e7c9f3d am: eb573246

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2550270



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