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: 16d02294

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



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