Merge "Adapt NET_CAPABILITY_TEMPORARILY_NOT_METERED in NetworkIdentity" am: 104d96f9d8 am: 460af8c9c2

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

Change-Id: I58ca7ab8ba7678adbca160795cc0cb06a08fd5ed