tree c4f1aebfb153f3467cbd78383bf66b80db8124fb
parent 3d4e6deeb3bfa834bc57275e8f3d65e7c227593c
parent 77ed87e072548cee6cd5c0e259af88531b64361c
author Aaron Huang <huangaaron@google.com> 1615288480 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615288480 +0000

Merge changes I1d1f0d2d,Ifbd4a978 am: 77ed87e072

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I156b9230ef2ea495a6d1661c3f618de4a9c2ac2a