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

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

Change-Id: I1193382337088113bf64a636b0b70429d28f8be6
tree: 5392ce53b5e097820ac15416a2df9ac7669b701d
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING