tree ffaddf244cad7a34e9d01980976ffebc3e55014c
parent f300258bf173d81553d721f6f4fbfd94e6a8f01d
parent 026fbb8a1fd6abfe69a135d4654c7701396a6f7e
author Lorenzo Colitti <lorenzo@google.com> 1612940156 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612940156 +0000

Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 250855cb84

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83b4210780cf87006be5f55439ade06cd7893530