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: 068b382f am: 8df0437a

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

Change-Id: Id79b877fa9852380388f70037df4cff793a18c76