tree c81e00edce3e904e44e0752c3c589d5f419d56cd
parent abc4de09cc6beb392e45ed2e753202bbb443b939
parent f263dba0430cb1bc29c779b4990f533996b3dc6b
author Junyu Lai <junyulai@google.com> 1615540020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615540020 +0000

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