Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf
automerge: db1e7fa

* commit 'db1e7fa097972d4cc26447f46abd8d4367d44eb7':
  Setting ADB_ENABLED may result in a SecurityException.