am f11b58f2: am fcf1689c: am 5fec7915: Merge "service_manager: reorder permission checks for find"

* commit 'f11b58f296039a0bf90336e4c38c014f11542092':
  service_manager: reorder permission checks for find