[automerger skipped] Merge "Enabled TEMP_NOT_METERED support for carriers"...

[automerger skipped] Merge "Enabled TEMP_NOT_METERED support for carriers" into rvc-qpr-dev am: dba47756 -s ours

am skip reason: Change-Id Ie0323a354c89abf1a0effa0b65cde3b4d010115e with SHA-1 ea53b4ef is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56538712420f66b3535606f0124361ccb5ca32d9