[automerger skipped] Merge changes from topic "gzip" am: 6715d943 am: f1f9db4f -s ours am: a8d64d9c -s ours

am skip reason: Change-Id Iab4b45940d3e3f3f79e37dea8644c4fc61217396 with SHA-1 2ebca0d0 is in history

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

Change-Id: Ie955df324b2b7938f623319ab048898445b22308