[automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727
Change-Id: I5ef627085baa0edd2aee1b19641104a0bedf108b
This commit is contained in: