[automerger skipped] Fix up some camera API javadocs am: 66a993beeb am: 804134ab87 am: bfa0ffbb9f am: 686d7aa0d8 -s ours

am skip reason: Change-Id If333d6fd5023d0bc5d778437d1745dcd209ccbd9 with SHA-1 66a993beeb is in history

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

Change-Id: Idc38e6b1113fe2b7d8cb2e251e3cc5b78b677b2e