Merge changes from topics "vcn04", "vcn12" am: 36b03734ef am: caa3ffacfe am: f263dba043

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3db655c53a855fe418ba5c6fd8230622805966d5