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

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

Change-Id: Ia98f52ff73000267b6c716e5033d35836d5d5f39