tree 048436916603992d535c3645ae5bfd37295c0465
parent 24d251403b74080ca2ac8534245c338f558c735f
parent 9af6ac78b052e76ba5d4afd647206e5927806b46
author Jeff Sharkey <jsharkey@google.com> 1607445799 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607445799 +0000

Merge changes from topic "dec5" am: c2793cf12b am: 9af6ac78b0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2776a545a24f007ccb4b9ee14705978571265ef3