tree 07aeb8546f90810938417bc37c3208a5336e8fb7
parent 3563eeb4ae49b6bab9be63f311a70058158082d2
parent c0b288133a2d8300c229672abbfa2fe8d2ddcd78
author Jeff Sharkey <jsharkey@google.com> 1600123011 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600123011 +0000

Merge changes from topic "sep11" am: c0b288133a

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

Change-Id: I4fd71573b4301e5473d44517a72d73858b3928c8