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

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

Change-Id: Ia2b44bc5e0b5afbaac4708ebc6b8eb0f26a57f83