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

Merge "Ensure expired leases are ignored and deleted." into rvc-dev am: 70f5e3e8 am: 52147095 am: 31623c0b am: 86b02abc

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

Change-Id: I3c34836f180920818f115fef72b12a8871c05954