Merge changes from topic "nnapi_ext_restrict"

* changes:
  Remove PRODUCT_SERVICES from PackageManagerNative.getLocation.
  Add getLocationFlags getter to PackageManagerNative.