[automerger skipped] Merge "Changed ApnThrottleStatus to ThrottleStatus" am: 9379af7c am: ce0ac679 am: 308f5080 -s ours am: 4c4fc216 -s ours

am skip reason: Change-Id I8bec64b0c38be94bcd3f3b99bcebfb378384c970 with SHA-1 793af039 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fd7beceb4864e121c40f0eb989ca93e7af40fe4