Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" am: 5becb8f399

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I165eaa765fbcac7dc4030d7cfafecef3cc84d01c