[automerger skipped] Merge "Remove unused API defaults" into mainline-prod am:...

[automerger skipped] Merge "Remove unused API defaults" into mainline-prod am: ac30bb52 -s ours am: 907ebe67 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic475501579b2053f2f6c23ae9c7557b9616fbbcb