Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: 7dc61be0da

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

Change-Id: I3c13a27c78cb824d366095edbf37d30527978def
tree: 0756fd6a9dcd141686243d3f32802cd656fa20c6
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING