Merge "Fix: dummy deviceKey is not correct if real device with dummy addr exist" into q-keystone-qcom-dev