Merge changes from topics "vcn04", "vcn12" am: d219f4807c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If14f8b2c89483095f22a2b1bc77b0d76cdcb8366
tree: 6f5d1b35517a2a422e4064df5ed5317dce514519
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS