Merge "Changed ApnThrottleStatus to ThrottleStatus" am: 9379af7c56 am: ce0ac6794a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581424

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb8ca010023526051a6a18a091002d189cd5254f