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

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

Change-Id: Ifb7db1c6cb074489f43247df4ac32e50121ec3e9