Merge "Add CachedService Class" into main am: ac1af41d42

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

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