Merge changes from topic "vcn-status-changed" am: 46c10cbc4d

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

Change-Id: I09c2595dcdc111087894d4c3da95310d9dd91be8