[automerger skipped] Merge changes from topics "apn_throttle",...

[automerger skipped] Merge changes from topics "apn_throttle", "rename_retry_interval" am: 1948c699 am: a36986be am: 16d63927 -s ours

am skip reason: Change-Id Ia4dd3036f583a97e42b6054019005df1b33dc33c with SHA-1 c47c3984 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee7224340eb4688c15b37538c79fbf2c2c48eb79