[automerger skipped] Add for Dolby thumbnail am: ed71a121 am: 3d679d88 am:...

[automerger skipped] Add for Dolby thumbnail am: ed71a121 am: 3d679d88 am: b887d139 am: 54c4766d -s ours

am skip reason: Merged-In Id196493ccbdc0a67764458cf14de651b8935d363 with SHA-1 b5cf9ea7 is already in history

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

Change-Id: Ibac7db27c25a789c8e5802d9e611af61d38ca6cc