Merge changes from topics "vcn04", "vcn12" am: 992f747392 am: 4c60c95d3c am: f263dba043

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3db655c53a855fe418ba5c6fd8230622805966d5
tree: 85a711553bd23f46c48f29188bd283ccddd72a69
  1. framework/
  2. service/
  3. OWNERS