Merge "Camera: Fix parameter misalignment in getDeviceVersion" into tm-qpr-dev am: 7e4fb4beed am: 811e540e46

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

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