[automerger skipped] Merge changes from topic "data-stall-metrics" am:...

[automerger skipped] Merge changes from topic "data-stall-metrics" am: fa92b3f7 am: 36265407 am: 3d6503a0 -s ours am: 61093176 -s ours am: fb22a17a -s ours

am skip reason: Merged-In I71ce81b3ad754325a6183c8c3f1dd4255cda65fc with SHA-1 121ea5fe is already in history

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

Change-Id: I169e3c6c05c56d5b37615942db0269f9f40e3157