tree 6da8d51c04370387450467984ff21987d68a3892
parent 3c65fd644fcd734b8220175824b908532437d33a
parent 0042358300a4045609fafb676818e6803ad72df3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1690200317 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1690200317 +0000

Merge changes Ib9a1af0c,I807496ec into main am: 010049c665 am: 0042358300

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2671557

Change-Id: I261809489f68e417481ba358d4922a6cb8a34036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>