Merge "Ensure expired leases are ignored and deleted." into rvc-dev am: 70f5e3e88b

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

Change-Id: Iab0cba4e03c0e6450efd10c5dbeb9808c163f10c