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

[automerger skipped] Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" am: 5becb8f3 am: b9938fb4 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11ed9c044e59b76e3d106b4598f21c6d5d855475