Merge "Dedupe default definitions slightly" am: 1dd24999da am: 0df14efb38 am: d0a53ed335

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

Change-Id: I634eec34eebf4db0303d4f01c6cd5c1c77958063