Merge "Merge "Camera: Fix link for nested classes" into tm-dev am: 3ff1283e...

Merge "Merge "Camera: Fix link for nested classes" into tm-dev am: 3ff1283e am: 14880984" into tm-d1-dev-plus-aosp am: e4b23c7d

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



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