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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67bced2a01779ef8adea11d88c9ba952c1c9886d