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

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

Change-Id: I93b4b472a3398ab89518d660b5ba07e53edf5495