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

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

Change-Id: I3c13a27c78cb824d366095edbf37d30527978def
tree: 71a0f98ec556de0d0dceacda443227193f8fee9a
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING