Merge "Changed ApnThrottleStatus to ThrottleStatus" am: 5abab3cfc2 am: dbace79498

Original change: https://android-review.googlesource.com/c/platform/cts/+/1579216

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcf5f07ae3c3f7ffe30fb60050c275b0a2d0eb1c