Merge "Camera: Fix test pattern data propagation" into sc-dev am: 001d147389 am: 22d6ae3bed

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

Change-Id: I73ea7848dd224a71b8e36fe5a9acbad9fbd6c421