Bass' proposed city budget includes more funding for LAPD, cuts for LAFD