Merge changes from topic "vcn-fwd" am: 57d20af2ea am: 7f55a7d6a3 am: 658556755c

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

Change-Id: I745687f69366657dc33bfdacd878e06affd6a8ec
tree: fb2bd7be0c3c97c6f54d7ba50e61e58ed5da6c48
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING