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

[automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e15795 am: 0cf6fdb7 am: 3c93e01c am: 9e82fb98 -s ours am: 1a17ae5c -s ours am: 2db515e1 -s ours am: cfb14e77 -s ours am: 811c886b -s ours

am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60 is already in history

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

Change-Id: I738bfa08d4cb8e13dda333ea5af033b108301d78