Merge "Camera: fix getKeys impl for vendor keys am: 1b1f14ebff" into qt-qpr1-dev-plus-aosp