[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: 138d803e -s ours am: b8a3a61c -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: Iee25d770adf052c0d428a4a02e01501ceb77c2fb