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

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

Change-Id: I98bc4bbbf5f8fd33ed96b6387fa6a703dd7b4052