Merge changes from topics "apn_throttle", "rename_retry_interval" am: 1948c69946 am: a36986be6c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia81a74e369cb395ff92a2276480015df3e0c9a56