Merge "Do not log an error about ro.sf.lcd_density on emulators" am: 6df92f0839 am: 7cfc7afb7a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2300980

Change-Id: I8e1c436a11b36b1cd5bc209160b908b80ec0cb33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>