[automerger skipped] Merge "NetworkCapabilities: Embed location senstive...

[automerger skipped] Merge "NetworkCapabilities: Embed location senstive TransportInfo" am: d3ee5559 am: 8244f5ea am: 0ffd0b02 -s ours

am skip reason: Change-Id Ie522d8c75a82ae521ccfd5165823d0c72642e651 with SHA-1 e9261ea9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7ace3cc9124b36ddc62306373442d724c3682d8