Merge changes I902b2816,I284d421e

* changes:
  Add DISALLOW_AIRPLANE_MODE.
  Add DISALLOW_CONFIG_LOCATION_MODE.