Merge commit '733fdf34b6a8a8e3983ff7663828a928d3c19944' into eclair-plus-aosp * commit '733fdf34b6a8a8e3983ff7663828a928d3c19944': Disable keyguard while docked when the lock screen is insecure.
Merge commit '733fdf34b6a8a8e3983ff7663828a928d3c19944' into eclair-plus-aosp * commit '733fdf34b6a8a8e3983ff7663828a928d3c19944': Disable keyguard while docked when the lock screen is insecure.