Merge "Restore the density when it has been overridden" into tm-d1-dev am:...

Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef30 am: 7e0b5c8c am: d68c5cd2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014



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