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

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

Change-Id: Ia7ea92a1b1c75c0fd75b1a39bb6e71f84519ab5a