Merge "Convert Camera2 to Soong" am: 04ca072c3d am: b3a00ef0e7 am: b7f8740495 am: edeef9d2d5

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2029263

Change-Id: I904c91da413c320cdfdf23cd7dea9d44722c7692