[automerger skipped] Merge "Remove unused API defaults" am: d0006466 am:...

[automerger skipped] Merge "Remove unused API defaults" am: d0006466 am: b88133cd am: ca4b8eb7 am: 3c8a6150 -s ours

am skip reason: Change-Id I312de1cc3d4ac493d3570d3b6ad6e94e6cb4e4db with SHA-1 b08d5c41 is in history

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

Change-Id: I46e342e62b28c46ba0a06008e650073a572f4ac0