Merge "adbd: refactor priv dropping logic"
am: 6945e36060

* commit '6945e360601a37301a6a678389d7bc9e974b1e23':
  adbd: refactor priv dropping logic