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

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

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