Merge "Fix cache flush always causing response change" am: e0f07a9dc1

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

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