[automerger skipped] Merge "TransportFeatureTagStats metrics inconsistencies"...

[automerger skipped] Merge "TransportFeatureTagStats metrics inconsistencies" am: b4bccbdc am: f9af4e9e am: af42a8df -s ours am: 2df25eef -s ours

am skip reason: Merged-In I78d380986597ad2c80b3a6d630b3a2632c21cc69 with SHA-1 0b760989 is already in history

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

Change-Id: Iaa98d5a4412c8e9499e4fe87ecb7fe083eb8e380