Merge "Use LongSupplier in LruCacheWithExpiry" into main am: 5da77c88ef

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3391786

Change-Id: I4c21b6afed373171206a16739d3eb9f1080201ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>