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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia80a9e19d92775bf74d6da8ecd4a6dc711c7f923