[automerger skipped] Merge "Remove PRODUCT_SERVICES from PackageManagerNative.getLocation." into qt-dev
am: b6520038 -s ours
am skip reason: change_id I98fda5751a7b1d2a6f3ad5b58682ad935fc30fa8 with SHA1 50b03113 is in history
Change-Id: I040b5802755e748a65897b8ac600b31539fba4d2