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

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

Change-Id: Ie8e596c209e5295daf552157b7f637d8a0cbf039