Merge "Remove defaults that add nothing" am: 4c11ce8ee3 am: f8319bd662

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

Change-Id: I7869d9cad9ac70df5246047cc508da0116f1d981