Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev