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