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

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

Change-Id: I3b7a25b5728504739923466516b83758a500d926