Merge "Adapt NET_CAPABILITY_TEMPORARILY_NOT_METERED in NetworkIdentity" am: 104d96f9d8 am: 460af8c9c2 am: 80051388f2 am: 7eacc01ba0 am: 5a87b681d4

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

Change-Id: I45d35aa1e1bcd81c1b0807848b5f9794811b1479