[automerger skipped] Remove PRODUCT_SERVICES from PackageManagerNative.getLocation.
am: 831e0184 -s ours
am skip reason: change_id I651796b7f2a79b6236e01bf52d9a80927805f217 with SHA1 68657b43 is in history
Change-Id: I382a3113bfdf8c3189d89e0aff72b9811629cc8b