Merge "Make configs differing only in density siblings" am: db0a92a881 am: 93cd93c3b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430088

Change-Id: I9578e7ae692b428c1c50caae2de7118a6eae498a