Merge "Clarify documentation on TEMP_NOT_METERED API" am: 9e7ff9a167 am: b6771dff52 am: 2e506764fc am: 8698f3f4d0

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

Change-Id: Ibfc36bfcf1550cd27ff5449d5dbd7ee34c9937c7