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 am: 88c26589

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



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