Merge "Camera: Various Camera2 extension updates" into sc-dev am: 88be1435e1 am: b75b86ada5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14630851 Change-Id: I55279f83a5547096d94e0538ed682f33a62fb69b
This commit is contained in: