[automerger skipped] Merge "Make configs differing only in density siblings"...

[automerger skipped] Merge "Make configs differing only in density siblings" am: db0a92a8 am: 93cd93c3 am: 26d31a44 am: 2ad3277a am: c2975d2b -s ours

am skip reason: Change-Id Ie9fba4c4b74af2b3bbf8fc6432539a99f8647634 with SHA-1 7b7085cc is in history

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

Change-Id: I35a1cd3dfaff401aeb4d371a269e1377d154dcb5