Merge "Add lock to update mCache from the constructor" into main am: 791687cf23 am: 7a39d73964

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

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