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

[automerger skipped] Merge changes from topics "apn_throttle", "rename_retry_interval" am: 5e5b52b2 am: 5ebefb0f am: 567c6f08 -s ours

am skip reason: Change-Id I41c04b6aa8a86fb4b392c1149f308fc092b6b766 with SHA-1 7db5ed06 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1536103

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie706e2d38a8f627c412cba14db7697e8d9543a98