Merge "Changed camera_id_arg to include camera sub id" am: e405bae148 am: 54db1e1034 am: 30839fa1e2

Original change: https://android-review.googlesource.com/c/platform/cts/+/1494223

Change-Id: I4df788bb5eedbff4f2f75e416045165c0abbd7fa