[automerger skipped] Merge "DO NOT MERGE Collect metrics for WFC settings."...

[automerger skipped] Merge "DO NOT MERGE Collect metrics for WFC settings." am: c3ceff68 -s ours am: 3c2675ae -s ours am: 7187d76a -s ours am: aa894301 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8d71d6dc4b0d461c1a32e7178c17b53c8e0270c7