Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: a47a93c64d am: 66f42f23f0

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

Change-Id: I745687f69366657dc33bfdacd878e06affd6a8ec
tree: 8c78945b592cffcaa05a8cb7a075e8852892d1e9
  1. core/
  2. services/