Merge "Add an option for vendors to provide a camera extensions proxy" into...

Merge "Add an option for vendors to provide a camera extensions proxy" into sc-dev am: b4d7c251 am: da4b7158

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

Change-Id: Id4b48b3bc4a5a8c367ac27045643cfd0e4dbcbf7