[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: b31822b3 -s ours am: df1723af -s ours am: 020f357b -s ours am: fbd41cbe -s ours am: 65735508 -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/+/15121727

Change-Id: Ibfe34492e769bf4c765c9991d17f46b89f9ff35d