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: 17775502

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



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