Merge commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910' into eclair-plus-aosp * commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910': Fix issue #2161726: Car dock app bypasses setup wizard
Merge commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910' into eclair-plus-aosp * commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910': Fix issue #2161726: Car dock app bypasses setup wizard