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

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

Change-Id: Ic2c377b31cd299c2bcef2b89f1f742b56fb2768f