Merge "Use ro.boot.serialconsole to disable console services"