Merge "Convert Camera2 to Soong" am: 04ca072c3d

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

Change-Id: I2db503851fda8475eb3bd5f34218d9949725ea09