Merge "CameraManager: Swap propertyName / packageName in call to getProperty()" into tm-qpr-dev am: f580918fe5 am: 996fbec1b7

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

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