[automerger skipped] Merge "Add external camera support" am: 18e9719835 am: f58f44c6c9 -s ours

am skip reason: Change-Id I83737de00eb1b01af298215e6da98a7948a78def with SHA-1 d66d2cfcf2 is in history

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

Change-Id: Ifaa38553e309de511a1d0d2976d47c56d79522be