Merge "Remove unused API defaults" am: d0006466a5 am: b88133cd87

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

Change-Id: Ie4d67991610ed76c23425b811a3b9ecb75ae4c2b