[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 am: 4488005e -s ours am: 409a55ad -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3189a60c3bd65e52c35c34eafec8f34c298ea24