am d42ab257: Merge change 23045 into eclair

Merge commit 'd42ab257604f5fd9e039c843ede477da29f6f3cf' into eclair-plus-aosp

* commit 'd42ab257604f5fd9e039c843ede477da29f6f3cf':
  Add persistent radio prop perms ; cleanup ws and typos.