[automerger skipped] Fix up some camera API javadocs am: 66a993beeb am: 93da736ac5 -s ours

am skip reason: Change-Id If333d6fd5023d0bc5d778437d1745dcd209ccbd9 with SHA-1 5671dcdfb6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13061797

Change-Id: I3d2c9e702b7b1544214a2440cfe1f46517f2f993