Merge "adbd: refactor priv dropping logic"