tree 3397a5100daa4a2d0127408fdcb59b64de38a720
parent f8319bd662cee4e9fa9500eb5c8b537835746efe
parent 53de4cb310a7f6179d82b58a55b93da0698a6965
author Junyu Lai <junyulai@google.com> 1643033544 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643033544 +0000

Merge changes I54c2258c,I47b2d3ac am: 53de4cb310

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

Change-Id: Id51ceff565e5d5467f3a236b5d43e5395d65bdac