Merge "Revert "Revert "Do not display ADB confirm dialog during boot"""