am c2af9be6: am bfab323c: Merge "Setting ADB_ENABLED may result in a...
am c2af9be6: am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev
automerge: aba9abae
* commit 'aba9abae':
Setting ADB_ENABLED may result in a SecurityException.