tree 9aac43e3ce483bc355dd614af29be1f2daa1f8a1
parent 95f5f547fc203d56c8ae754ae3ad6c90eb5d5fe5
parent e5929c073cd18456eaff31431fa4b1b5039c7bd0
author Junyu Lai <junyulai@google.com> 1620993809 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620993809 +0000

Merge "[FUI26] Address comments on aosp/1560408" am: 8f03f1e788 am: e5929c073c

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

Change-Id: If6b9da9ce754f33868305075013b0f82ff64fedb