tree 9aac43e3ce483bc355dd614af29be1f2daa1f8a1
parent 38544887c7e1b0e0babb52808d6e022ed2d2b9b7
parent 8f03f1e788c37eec77e4bc26672ae329ceb58d86
author Junyu Lai <junyulai@google.com> 1620992894 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620992894 +0000

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

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

Change-Id: Idde0e161d6241a5c45c0b751e1fca912ed10c7a8