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

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

Change-Id: I1c210272b225f94446add06644e0138487f29e2c