Merge "Don't use framework permission strings for netd permissions." into lmp-mr1-dev