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

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

Change-Id: Id11bfbcebf11ffa51e03a477d9d2d1f63859d978