[automerger skipped] Merge "Fixed unmetered network request caused data leak"...

[automerger skipped] Merge "Fixed unmetered network request caused data leak" am: 1ef32bad am: 4a89a800 am: 2866ec94 -s ours

am skip reason: Merged-In I30d781c45b7a1c89646ec6d168928e5289dc5575 with SHA-1 0c8d1a23 is already in history

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

Change-Id: I803059d6d92246b412e480839b3d004aab4bd191