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

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

Change-Id: I7f02785727c73c27ac498ad4663f25252242c6e0