Merge "Adapt NET_CAPABILITY_TEMPORARILY_NOT_METERED in NetworkIdentity" am: 104d96f9d8

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

Change-Id: Ia080b4ac70ca65470b16c77b25c7f119887594b0