[automerger skipped] Merge "Do not log an error about ro.sf.lcd_density on...

[automerger skipped] Merge "Do not log an error about ro.sf.lcd_density on emulators" am: 6df92f08 am: 7cfc7afb am: be6a09d1 -s ours

am skip reason: Merged-In I69630586ca234db21ea1fbe0d70bbe21155f0b4d with SHA-1 3388bf9c is already in history

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



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