Merge "Merge "Camera: Update the advanced extension version checks" into...

Merge "Merge "Camera: Update the advanced extension version checks" into tm-dev am: 48a2973f am: d383b009" into tm-d1-dev-plus-aosp am: 24591422

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



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