[automerger skipped] Merge "Remove PRODUCT_SERVICES from PackageManagerNative.getLocation." into qt-dev
am: 81890b23 -s ours
am skip reason: change_id I651796b7f2a79b6236e01bf52d9a80927805f217 with SHA1 831e0184 is in history
Change-Id: Iff1848e7a416b4857abff745cb5398f32219d21c