Merge "camera2: Fix getConcurrentCameraIds doc formatting" am: 282a29b8 am: c1a873af

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



Change-Id: I138c1c678d81e298fd1986bcf905793aad407ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>