Merge changes from topics "vcn04", "vcn12" am: d219f4807c am: 10af6fb500 am: ed8aca675d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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