Merge "Change permissions checks for setAirplaneMode."
am: 7b81c459ce

Change-Id: I578923c3f9012055f715e536f5d4d42ed669c5ee
tree: 86ae68c3889ad34e15aadb8940c51bc72cb9c463
  1. core/
  2. services/
  3. tests/