Merge "MediaTesting: Add colorutils unit test" am: bd992267db am: fcc350b285 am: e67841bed6 am: 48ef585721

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

Change-Id: I8d124c49f09c44ff721c09fef2a45c4cab7aa192