[automerger skipped] Merge "Changed ApnThrottleStatus to ThrottleStatus" am: 5abab3cfc2 am: dbace79498 am: 1a955d18fb -s ours

am skip reason: Change-Id I6569265ff7749eb79c8dae30ebb17ad353f4f8fe with SHA-1 5f846dd44e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6541d5be2d37721f8cd9a7dce60489513f9874bb