am 0610ff97: Merge "Don\'t use framework permission strings for netd permissions." into lmp-mr1-dev

* commit '0610ff97f11d37d514ea20fcbd73a96ede3518ce':
  Don't use framework permission strings for netd permissions.