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

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

Change-Id: I036a62388b505de01bc022fceec6a2107e5a00b7