Merge "CameraManager: Swap propertyName / packageName in call to...

Merge "CameraManager: Swap propertyName / packageName in call to getProperty()" into tm-qpr-dev am: f580918f am: 996fbec1 am: 3d1b8b9a

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



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