[automerger skipped] Merge "camera2: Fix exception swallowing in params...

[automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6 am: 250fe56a -s ours am: d3894cef -s ours am: 0965418b -s ours am: 8d6dbba1 -s ours am: a0143a65 -s ours am: 77cb4f69 -s ours am: 79a8a321 -s ours

am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb9 is already in history

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

Change-Id: I804ee9df4e480f0df6e0c718d9cc071e4de1d8c4