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