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 am: 19dbf83b

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



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