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