Merge "Quick change to add default to deprecated callback method so...

Merge "Quick change to add default to deprecated callback method so implementors can move to new api." into sc-dev am: 0b9af71d

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

Change-Id: I6621e886cd8acd2866252c1d0bfe6828db3e6302