Merge "Do not log an error about ro.sf.lcd_density on emulators"