Merge "Camera: Various Camera2 extension updates" into sc-dev am: 88be1435 am: b75b86ad am: 73a4abcb

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

Change-Id: I59efe3176d02e39c2bdd08b6d55a3d09ed4080bb