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

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