Merge changes from topic "vcn-status-cb" am: dcaf81ebff

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93310f81fd85f7edd7bb16bb514c657658782479