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

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

Change-Id: If92766d0e4d688ce5550e207f8e9ae1027483098