[automerger skipped] Merge "Changed ApnThrottleStatus to ThrottleStatus" am:...

[automerger skipped] Merge "Changed ApnThrottleStatus to ThrottleStatus" am: 224485b5 am: 008aa707 am: 81e82175 -s ours

am skip reason: Change-Id I1b8446ab7bbb9cb893fe13c685fc2f9538aa242f with SHA-1 a764b315 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba2b9ab8d831cd475ad6a5506cf1731353d76f29