Merge "Use blobs expiry time in LeaseInfo if the lease expiry time is 0." into rvc-dev am: 7c30ab8c50

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

Change-Id: If7e9d5c11b0d76e0a1636360da5cce09fef75d85