[automerger skipped] Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED...

[automerger skipped] Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" into rvc-qpr-dev-plus-aosp am: a2b07658 -s ours

am skip reason: Change-Id I2b987d24851cdb16d8457b0ec5c546ace5485ed0 with SHA-1 4f80a3b7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc014acea5f546677ffad4bb1b8b142b3d372223