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

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

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

Change-Id: I28b88b2357b7e7fdead03b87399bca061555508c