Merge "Dedupe default definitions slightly" am: 1dd24999da

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

Change-Id: If90402a1e77d6de29f5016e3e2a27df4c66fa0d3