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

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



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