[automerger skipped] Merge "Collect metrics for WFC settings." am: 4d97a2e9...

[automerger skipped] Merge "Collect metrics for WFC settings." am: 4d97a2e9 -s ours am: f981aaca -s ours am: 2cb8a19d -s ours

am skip reason: Merged-In Iadcd233769f27f031b19885fa6daebd51dda9bb1 with SHA-1 de9a03b4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2082335



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