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

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

Change-Id: I191e6a73dd0bcea0a823dbd094f94677e4e2ff8e