Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: fc14eeaf35

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

Change-Id: I4e11bdfa3e887103673a354aad7f9b5fa746ac9e
tree: 7d662f9daafeae91c8d0db13f8385938d8654386
  1. core/
  2. services/