tree 9a020ea0ada1a69ccf9d7ea4accdaacc94038ef5
parent 0fef75ee539b87f6d7bc73e3db0b774a9374df49
parent 67ba0bc206c09ca65c064e4a76bc5441176cbc0e
author Lucas Lin <lucaslin@google.com> 1614712435 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614712435 +0000

Merge changes I06ab0f2d,I8b146aa1 am: 67ba0bc206

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0332bf0bf07a0a958c2e75b464d577021fd57746