Merge "Adds expirations for remote callbacks" into sc-dev am: 73d3172e am: a33504ba am: e0a04457

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

Change-Id: Ia06bc66cf2048423546d3d26b5d4aa12b95a8e94