Merge "camera2: Fix parcelling of sensor pixel modes." into sc-dev am: 1cdc8379 am: d767220f

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

Change-Id: I61baf4dc8ce0920676875e9a794d8f28e1e4d7b1