Merge "Prevent system service crash after SQL error in AccountManagerService." into main