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

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

Change-Id: Ia0741344c16ac6cd6915de68e8c938b0a1334668