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

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

Change-Id: I4e11bdfa3e887103673a354aad7f9b5fa746ac9e