[automerger skipped] Merge "Add external camera support" am: 18e9719835 am: f58f44c6c9 -s ours am: e0acf31bbb -s ours am: 2a158dc272 -s ours am: d808df1414 -s ours am: 25de2783b5 -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: Ibb15dc62b69640fcbd855e86d54a1a788c294aac