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

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

Change-Id: Ieab95c166359af559ed30c2b588b47a8d06d4e63