Merge "Camera: Update the advanced extension version checks" into tm-dev am:...

Merge "Camera: Update the advanced extension version checks" into tm-dev am: 48a2973f am: e7a9a2f4

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



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