Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 5e21b83410

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83b4210780cf87006be5f55439ade06cd7893530
tree: e5c61cd5dd5a3a856228bbcbdc73c396ce6d5192
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS