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

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

Change-Id: Ic280f40686a07f95e948974606727eda916a5091